x11: Don't use g_print for debug output

The g_print documentation explicitly says not to do this, since
g_print is meant to be redirected by applications. Instead use
g_message for logging that can be triggered via GTK_DEBUG.

diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index 602a766bba3eae711ba330dd701b7368415f6b17..2e7ea1f41b39fcc14791cea2c39bf1e287d8912f 100644 (file)
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -55,7 +55,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
             {
               GdkX11DeviceManagerXI2 *device_manager_xi2;
 
-              GDK_NOTE (INPUT, g_print ("Creating XI2 device manager\n"));
+              GDK_NOTE (INPUT, g_message ("Creating XI2 device manager"));
 
               device_manager_xi2 = g_object_new (GDK_TYPE_X11_DEVICE_MANAGER_XI2,
                                                  "display", display,
@@ -70,7 +70,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
 #endif /* XINPUT_2 */
     }
 
-  GDK_NOTE (INPUT, g_print ("Creating core device manager\n"));
+  GDK_NOTE (INPUT, g_message ("Creating core device manager"));
 
   return g_object_new (GDK_TYPE_X11_DEVICE_MANAGER_CORE,
                        "display", display,

diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 1bb8ac24909a19640cb201e7310683aa640da0fe..d6448b36f1005af98c30befa1e72934fbcdea7e7 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -232,10 +232,10 @@ gdk_x11_gl_context_end_frame (GdkGLContext *context,
   drawable = context_x11->drawable;
 
   GDK_NOTE (OPENGL,
-            g_print ("Flushing GLX buffers for drawable %lu (window: %lu), frame sync: %s\n",
-                     (unsigned long) drawable,
-                     (unsigned long) gdk_x11_window_get_xid (window),
-                     context_x11->do_frame_sync ? "yes" : "no"));
+            g_message ("Flushing GLX buffers for drawable %lu (window: %lu), frame sync: %s",
+                       (unsigned long) drawable,
+                       (unsigned long) gdk_x11_window_get_xid (window),
+                       context_x11->do_frame_sync ? "yes" : "no"));
 
   /* if we are going to wait for the vertical refresh manually
    * we need to flush pending redraws, and we also need to wait
@@ -655,11 +655,11 @@ gdk_x11_gl_context_realize (GdkGLContext  *context,
     flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
 
   GDK_NOTE (OPENGL,
-            g_print ("Creating core GLX context (version:%d.%d, debug:%s, forward:%s, legacy:%s)\n",
-                     major, minor,
-                     debug_bit ? "yes" : "no",
-                     compat_bit ? "yes" : "no",
-                     legacy_bit ? "yes" : "no"));
+            g_message ("Creating core GLX context (version:%d.%d, debug:%s, forward:%s, legacy:%s)",
+                       major, minor,
+                       debug_bit ? "yes" : "no",
+                       compat_bit ? "yes" : "no",
+                       legacy_bit ? "yes" : "no"));
 
   /* If we have access to GLX_ARB_create_context_profile then we can ask for
    * a compatibility profile; if we don't, then we have to fall back to the
@@ -667,7 +667,7 @@ gdk_x11_gl_context_realize (GdkGLContext  *context,
    */
   if (legacy_bit && !GDK_X11_DISPLAY (display)->has_glx_create_context)
     {
-      GDK_NOTE (OPENGL, g_print ("Creating legacy GL context on request\n"));
+      GDK_NOTE (OPENGL, g_message ("Creating legacy GL context on request"));
       context_x11->glx_context = create_legacy_context (display, context_x11->glx_config, share);
     }
   else
@@ -685,7 +685,7 @@ gdk_x11_gl_context_realize (GdkGLContext  *context,
           minor = 0;
         }
 
-      GDK_NOTE (OPENGL, g_print ("Creating GL3 context\n"));
+      GDK_NOTE (OPENGL, g_message ("Creating GL3 context"));
       context_x11->glx_context = create_gl3_context (display,
                                                      context_x11->glx_config,
                                                      share,
@@ -694,7 +694,7 @@ gdk_x11_gl_context_realize (GdkGLContext  *context,
       /* Fall back to legacy in case the GL3 context creation failed */
       if (context_x11->glx_context == NULL)
         {
-          GDK_NOTE (OPENGL, g_print ("Creating fallback legacy context\n"));
+          GDK_NOTE (OPENGL, g_message ("Creating fallback legacy context"));
           context_x11->glx_context = create_legacy_context (display, context_x11->glx_config, share);
           legacy_bit = TRUE;
         }
@@ -775,9 +775,9 @@ gdk_x11_gl_context_realize (GdkGLContext  *context,
   context_x11->drawable = drawable;
 
   GDK_NOTE (OPENGL,
-            g_print ("Realized GLX context[%p], %s\n",
-                     context_x11->glx_context,
-                     context_x11->is_direct ? "direct" : "indirect"));
+            g_message ("Realized GLX context[%p], %s",
+                       context_x11->glx_context,
+                       context_x11->is_direct ? "direct" : "indirect"));
 
   return TRUE;
 }
@@ -796,7 +796,7 @@ gdk_x11_gl_context_dispose (GObject *gobject)
       if (glXGetCurrentContext () == context_x11->glx_context)
         glXMakeContextCurrent (dpy, None, None, NULL);
 
-      GDK_NOTE (OPENGL, g_print ("Destroying GLX context\n"));
+      GDK_NOTE (OPENGL, g_message ("Destroying GLX context"));
       glXDestroyContext (dpy, context_x11->glx_context);
       context_x11->glx_context = NULL;
     }
@@ -869,15 +869,15 @@ gdk_x11_screen_init_gl (GdkScreen *screen)
     epoxy_has_glx_extension (dpy, screen_num, "GLX_EXT_visual_rating");
 
   GDK_NOTE (OPENGL,
-            g_print ("GLX version %d.%d found\n"
-                     " - Vendor: %s\n"
-                     " - Checked extensions:\n"
-                     "\t* GLX_ARB_create_context_profile: %s\n"
-                     "\t* GLX_SGI_swap_control: %s\n"
-                     "\t* GLX_EXT_texture_from_pixmap: %s\n"
-                     "\t* GLX_SGI_video_sync: %s\n"
-                     "\t* GLX_EXT_buffer_age: %s\n"
-                     "\t* GLX_OML_sync_control: %s\n",
+            g_message ("GLX version %d.%d found\n"
+                       " - Vendor: %s\n"
+                       " - Checked extensions:\n"
+                       "\t* GLX_ARB_create_context_profile: %s\n"
+                       "\t* GLX_SGI_swap_control: %s\n"
+                       "\t* GLX_EXT_texture_from_pixmap: %s\n"
+                       "\t* GLX_SGI_video_sync: %s\n"
+                       "\t* GLX_EXT_buffer_age: %s\n"
+                       "\t* GLX_OML_sync_control: %s",
                      display_x11->glx_version / 10,
                      display_x11->glx_version % 10,
                      glXGetClientString (dpy, GLX_VENDOR),
@@ -1296,14 +1296,14 @@ gdk_x11_display_make_gl_context_current (GdkDisplay   *display,
     }
 
   GDK_NOTE (OPENGL,
-            g_print ("Making GLX context current to drawable %lu\n",
-                     (unsigned long) context_x11->drawable));
+            g_message ("Making GLX context current to drawable %lu",
+                       (unsigned long) context_x11->drawable));
 
   if (!glXMakeContextCurrent (dpy, context_x11->drawable, context_x11->drawable,
                               context_x11->glx_context))
     {
       GDK_NOTE (OPENGL,
-                g_print ("Making GLX context current failed\n"));
+                g_message ("Making GLX context current failed"));
       return FALSE;
     }
 

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index f807e52880f02a41c4b38ef4e10f392bf5e99096..3c55ef114d3d1447930a7ef70e86de76dabcec9e 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -276,7 +276,7 @@ parse_settings (unsigned char *data,
       !fetch_card32 (&buffer, &n_entries))
     goto out;
 
-  GDK_NOTE(SETTINGS, g_print("reading %u settings (serial %u byte order %u)\n", n_entries, serial, buffer.byte_order));
+  GDK_NOTE(SETTINGS, g_message ("reading %u settings (serial %u byte order %u)", n_entries, serial, buffer.byte_order));
 
   for (i = 0; i < n_entries; i++)
     {
@@ -307,7 +307,7 @@ parse_settings (unsigned char *data,
           g_value_init (value, G_TYPE_INT);
           g_value_set_int (value, (gint32) v_int);
 
-          GDK_NOTE(SETTINGS, g_print("  %s = %d\n", x_name, (gint32) v_int));
+          GDK_NOTE(SETTINGS, g_message ("  %s = %d", x_name, (gint32) v_int));
          break;
        case XSETTINGS_TYPE_STRING:
           {
@@ -321,7 +321,7 @@ parse_settings (unsigned char *data,
             g_value_init (value, G_TYPE_STRING);
             g_value_take_string (value, s);
 
-            GDK_NOTE(SETTINGS, g_print("  %s = \"%s\"\n", x_name, s));
+            GDK_NOTE(SETTINGS, g_message ("  %s = \"%s\"", x_name, s));
           }
          break;
        case XSETTINGS_TYPE_COLOR:
@@ -344,12 +344,12 @@ parse_settings (unsigned char *data,
             g_value_init (value, G_TYPE_STRING);
             g_value_set_boxed (value, &rgba);
 
-            GDK_NOTE(SETTINGS, g_print("  %s = #%02X%02X%02X%02X\n", x_name, alpha,red, green, blue));
+            GDK_NOTE(SETTINGS, g_message ("  %s = #%02X%02X%02X%02X", x_name, alpha,red, green, blue));
           }
          break;
        default:
          /* Quietly ignore unknown types */
-          GDK_NOTE(SETTINGS, g_print("  %s = ignored (unknown type %u)\n", x_name, type));
+          GDK_NOTE(SETTINGS, g_message ("  %s = ignored (unknown type %u)", x_name, type));
          break;
        }
 
@@ -359,12 +359,12 @@ parse_settings (unsigned char *data,
 
       if (gdk_name == NULL)
         {
-          GDK_NOTE(SETTINGS, g_print("    ==> unknown to GTK\n"));
+          GDK_NOTE(SETTINGS, g_message ("    ==> unknown to GTK"));
           free_value (value);
         }
       else
         {
-          GDK_NOTE(SETTINGS, g_print("    ==> storing as '%s'\n", gdk_name));
+          GDK_NOTE(SETTINGS, g_message ("    ==> storing as '%s'", gdk_name));
 
           if (settings == NULL)
             settings = g_hash_table_new_full (g_str_hash, g_str_equal,